Skip to content

[8.x](backport #40974) Add filebeat receiver and otel consumer output#40998

Merged
leehinman merged 3 commits into8.xfrom
mergify/bp/8.x/pr-40974
Sep 27, 2024
Merged

[8.x](backport #40974) Add filebeat receiver and otel consumer output#40998
leehinman merged 3 commits into8.xfrom
mergify/bp/8.x/pr-40974

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2024 •
edited by zube bot
Loading

Proposed commit message

This PR adds a filebeat receiver and an otelconsumer output. These can be used together to run filebeat as an otel receiver.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

None

Author's Checklist

  • [ ]

How to test this PR locally

receiver_test.go shows how receiver is created, started and stopped.

factories.Receivers, err = receiver.MakeFactoryMap(
                fbreceiver.NewFactory(),
        )

could be used in the opentelemetry collector to add the filebeat receiver.

Configuration would look like:

receivers:
  filebeatreceiver:
    filebeat:
      inputs:
        - type: benchmark
          enabled: true
          message: "test"
		  eps: 5
    output:
      otelconsumer:
    logging:
      level: debug
      selectors:
        - '*'
    processors:
      - add_fields:
          target: project
          fields:
            name: myproject
processors:
  batch:
exporters:
  debug:
    verbosity: detailed
    sampling_initial: 100
service:
  pipelines:
    logs:
      receivers: [filebeatreceiver]
      processors: [batch]
      exporters: [debug]

Related issues

Use cases

Screenshots

Logs

This is an automatic backport of pull request #40974 done by [Mergify](https://mergify.com).

@leehinman @mergify
Add filebeat receiver and otel consumer output (#40974)
c4f86b3 
* Add filebeat receiver and otel consumer output

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
(cherry picked from commit 8b93e1c)

# Conflicts:
#	go.mod
@mergify mergify bot added the backport label Sep 26, 2024
@mergify mergify bot requested a review from a team as a code owner September 26, 2024 00:01
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 26, 2024
@mergify mergify bot requested a review from a team as a code owner September 26, 2024 00:01
@mergify mergify bot requested review from VihasMakwana and mauri870 and removed request for a team September 26, 2024 00:01
@mergify
Copy link
Contributor Author

mergify bot commented Sep 26, 2024

Cherry-pick of 8b93e1c has failed:

On branch mergify/bp/8.x/pr-40974
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit 8b93e1c6c8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   dev-tools/notice/overrides.json
	modified:   go.sum
	modified:   libbeat/cmd/instance/beat.go
	new file:   libbeat/outputs/otelconsumer/config.go
	new file:   libbeat/outputs/otelconsumer/otelconsumer.go
	new file:   libbeat/outputs/otelconsumer/otelconsumer_test.go
	modified:   libbeat/publisher/includes/includes.go
	new file:   x-pack/filebeat/fbreceiver/config.go
	new file:   x-pack/filebeat/fbreceiver/config_test.go
	new file:   x-pack/filebeat/fbreceiver/factory.go
	new file:   x-pack/filebeat/fbreceiver/receiver.go
	new file:   x-pack/filebeat/fbreceiver/receiver_test.go
	modified:   x-pack/filebeat/input/default-inputs/inputs_windows.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 26, 2024
@pierrehilbert pierrehilbert requested review from leehinman and removed request for VihasMakwana and mauri870 September 26, 2024 07:16
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 26, 2024
@elasticmachine
Copy link
Contributor

elasticmachine commented Sep 26, 2024

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 26, 2024
@leehinman leehinman merged commit 2d87521 into 8.x Sep 27, 2024
@leehinman leehinman deleted the mergify/bp/8.x/pr-40974 branch September 27, 2024 13:45
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leehinman leehinman leehinman approved these changes

Assignees

@leehinman leehinman

Labels

backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @leehinman @pierrehilbert